Add -O by default. Allow additional debug & opts from cmd line.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 5192352644297ef4606199adf352929f4fc36a25..b881ae1b200c5d8c9042274ecb2c458498eb24d2 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -5,8 +5,13 @@
 # INHIBIT_EXPAT=-DNO_EXPAT
 LIBEXPAT=-lexpat
 
+#
+# Enable either or both of these as you wish.
+#
+OPTIMIZATION=-O $(EXTRA_OPTIMIZATION)
+DEBUGGING=-g $(EXTRA_DEBUGGING)
 # add -DDEBUG_MEM to turn on memory allocation logging
-CFLAGS=$(EXTRA_CFLAGS) -g -Icoldsync  $(INHIBIT_EXPAT)
+CFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -Icoldsync $(INHIBIT_EXPAT) $(OPTIMIZATION)
 INSTALL_TARGETDIR=/usr/local/
 
 FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o \
@@ -63,8 +68,8 @@ dep:
        (echo -n "internal_styles.c: mkstyle.sh " ; echo style/*.style ; /bin/echo -e "\t./mkstyle.sh > $@ || (rm -f $@ ; exit 1)" ) >> /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_1_1_beta00514003
-VERSIOND=1.1.1_beta00514003
+VERSIONU=1_1_1_beta07312003
+VERSIOND=1.1.1_beta07312003
 release:
        rm -fr gpsbabel-$(VERSIOND)
        cvs tag gpsbabel_$(VERSIONU)